shortcutcontroller: Add private API for running class shortcuts

We don't want regular users to be able to run class shortcuts in their
controllers, so we have to special case that.

diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c
index 6d57bb7b7a33f96d049f83c5632743984eece2f6..005c480033dbf25d16fc738f86ea7c86f91ce0f5 100644 (file)
--- a/gtk/gtkshortcutcontroller.c
+++ b/gtk/gtkshortcutcontroller.c
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#include "gtkshortcutcontroller.h"
+#include "gtkshortcutcontrollerprivate.h"
 
 #include "gtkeventcontrollerprivate.h"
 #include "gtkbindings.h"
@@ -41,6 +41,8 @@
 struct _GtkShortcutController
 {
   GtkEventController parent_instance;
+
+  guint run_class : 1;
 };
 
 struct _GtkShortcutControllerClass
@@ -82,17 +84,21 @@ gtk_shortcut_controller_handle_event (GtkEventController *controller,
   const GSList *l;
 
   widget = gtk_event_controller_get_widget (controller);
-  if (event_type == GDK_KEY_PRESS ||
-      event_type == GDK_KEY_RELEASE)
-    {
-      if (gtk_bindings_activate_event (G_OBJECT (widget), event))
-        return TRUE;
-    }
 
-  for (l = gtk_widget_class_get_shortcuts (GTK_WIDGET_GET_CLASS (widget)); l; l = l->next)
+  if (self->run_class)
     {
-      if (gtk_shortcut_controller_trigger_shortcut (self, l->data, event))
-        return TRUE;
+      if (event_type == GDK_KEY_PRESS ||
+          event_type == GDK_KEY_RELEASE)
+        {
+          if (gtk_bindings_activate_event (G_OBJECT (widget), event))
+            return TRUE;
+        }
+
+      for (l = gtk_widget_class_get_shortcuts (GTK_WIDGET_GET_CLASS (widget)); l; l = l->next)
+        {
+          if (gtk_shortcut_controller_trigger_shortcut (self, l->data, event))
+            return TRUE;
+        }
     }
 
   return FALSE;
@@ -119,3 +125,10 @@ gtk_shortcut_controller_new (void)
   return g_object_new (GTK_TYPE_SHORTCUT_CONTROLLER,
                        NULL);
 }
+
+void
+gtk_shortcut_controller_set_run_class (GtkShortcutController  *controller,
+                                       gboolean                run_class)
+{
+  controller->run_class = run_class;
+}

diff --git a/gtk/gtkshortcutcontrollerprivate.h b/gtk/gtkshortcutcontrollerprivate.h
new file mode 100644 (file)
index 0000000..945e526
--- /dev/null
+++ b/gtk/gtkshortcutcontrollerprivate.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2018 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#ifndef __GTK_SHORTCUT_CONTROLLER_PRIVATE_H__
+#define __GTK_SHORTCUT_CONTROLLER_PRIVATE_H__
+
+#include "gtkshortcutcontroller.h"
+
+void                    gtk_shortcut_controller_set_run_class           (GtkShortcutController  *controller,
+                                                                         gboolean                run_class);
+
+#endif /* __GTK_SHORTCUT_CONTROLLER_H__ */

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 480897af3a2a0a1e7a9681608caaa689c0a2184c..d85f3109ed322aeef96f8e5ce6c9407d3f693000 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -59,7 +59,7 @@
 #include "gtkscrollable.h"
 #include "gtksettingsprivate.h"
 #include "gtkshortcut.h"
-#include "gtkshortcutcontroller.h"
+#include "gtkshortcutcontrollerprivate.h"
 #include "gtkshortcuttrigger.h"
 #include "gtksizegroup-private.h"
 #include "gtksnapshotprivate.h"
@@ -2354,6 +2354,7 @@ gtk_widget_init (GTypeInstance *instance, gpointer g_class)
   GtkWidget *widget = GTK_WIDGET (instance);
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
   GType layout_manager_type;
+  GtkEventController *controller;
 
   widget->priv = priv;
 
@@ -2426,7 +2427,9 @@ gtk_widget_init (GTypeInstance *instance, gpointer g_class)
   if (layout_manager_type != G_TYPE_INVALID)
     gtk_widget_set_layout_manager (widget, g_object_new (layout_manager_type, NULL));
 
-  gtk_widget_add_controller (widget, gtk_shortcut_controller_new ());
+  controller = gtk_shortcut_controller_new ();
+  gtk_shortcut_controller_set_run_class (GTK_SHORTCUT_CONTROLLER (controller), TRUE);
+  gtk_widget_add_controller (widget, controller);
 }
 
 /**